build: disable Vulkan by default

We don't want people to build Vulkan support when they just want to get
GTK built.

This is in particular true for GTK as a CI subproject or for people
using jhbuild.

Worse, just having Vulkan support compiled in tends to cause crashes
in the Inspector, even if you are not using it.

diff --git a/.gitlab-ci/test-docker.sh b/.gitlab-ci/test-docker.sh
index ada8edaba6a7eefd96a91d630262e22932768877..1df2da094ae9a126049fcd57ab1d1e8bfea16751 100755 (executable)
--- a/.gitlab-ci/test-docker.sh
+++ b/.gitlab-ci/test-docker.sh
@@ -15,7 +15,7 @@ meson \
         -Dx11-backend=true \
         -Dwayland-backend=true \
         -Dbroadway-backend=true \
-        -Dvulkan=yes \
+        -Dvulkan=enabled \
         -Dprofiler=true \
         --werror \
         ${EXTRA_MESON_FLAGS:-} \

diff --git a/meson_options.txt b/meson_options.txt
index 2223cb79646ee16773754bd788831954e535a976..3a471a2025411e370f750de1aab01458dade0ba4 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -50,8 +50,8 @@ option('print-cups',
 
 option('vulkan',
        type: 'feature',
-       value: 'auto',
-       description : 'Enable support for the Vulkan graphics API')
+       value: 'disabled',
+       description : 'Enable support for the experimental Vulkan graphics API')
 
 option('xinerama',
        type: 'feature',